No error in case series do not exist, #112

diff --git a/itest/test_select_ns.py b/itest/test_select_ns.py
index 5d815c29d9586f1b22f9f069d411613f8c575af5..0ab80229ee047d52595e5ed129b57e3b149158b3 100644 (file)
--- a/itest/test_select_ns.py
+++ b/itest/test_select_ns.py
@@ -102,7 +102,7 @@ TIME_PRECISION = 'ns'
 
 
 class TestSelectNano(TestBase):
-    title = 'Test select and aggregate functions'
+    title = 'Test select and aggregate functions (ns)'
 
     GEN_POINTS = functools.partial(
         gen_points, n=1, time_precision=TIME_PRECISION)

diff --git a/itest/test_series.py b/itest/test_series.py
index 384b83ffd2fdc585d61aea9c542ed5eae8ab3022..3a19e81e3c4b5ce4c411c8ff8510e26dc1633e86 100644 (file)
--- a/itest/test_series.py
+++ b/itest/test_series.py
@@ -107,6 +107,11 @@ class TestSeries(TestBase):
                 'select * from "string", "integer", "double"'),
             expected)
 
+        self.assertAlmostEqual(
+            await self.client0.query(
+                'select * from "x", "string", "integer", "double", "nexist"'),
+            expected)
+
         self.client0.close()
 
 

diff --git a/src/siri/db/listener.c b/src/siri/db/listener.c
index 2aea352adc8f480c4612eb6dc45cf578f027393f..b74c9f548f35f0d902134c935f26108441487eb8 100644 (file)
--- a/src/siri/db/listener.c
+++ b/src/siri/db/listener.c
@@ -1183,6 +1183,7 @@ static void enter_series_name(uv_async_t * handle)
         if (pool == siridb->server->pool)
         {
             series = (siridb_series_t *) ct_get(siridb->series, series_name);
+#ifdef SERIESMUSTEXIST
             if (series == NULL)
             {
                 /* the series does not exist */
@@ -1193,6 +1194,7 @@ static void enter_series_name(uv_async_t * handle)
                 siridb_query_send_error(handle, CPROTO_ERR_QUERY);
                 return;
             }
+#endif
         }
         else if (q_wrapper->pmap != NULL && imap_set(
                 q_wrapper->pmap,